From: David Ross <daboross@daboross.net>
Date: Wed, 14 Feb 2018 06:17:15 +0000 (-0800)
Subject: Remove cargo-only downloads from installation docs
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~96^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=3e4d1558ab63605d15d6d143b0b5f89ea579a8b8;p=cargo.git

Remove cargo-only downloads from installation docs

This also copies extra instructions for installing rust from https://doc.rust-lang.org/book/first-edition/getting-started.html#installing-rust-1.

Fixes https://github.com/rust-lang/cargo/issues/5027.
---

diff --git a/src/doc/src/getting-started/installation.md b/src/doc/src/getting-started/installation.md
index 98b84780b..186c9daa5 100644
--- a/src/doc/src/getting-started/installation.md
+++ b/src/doc/src/getting-started/installation.md
@@ -1,38 +1,37 @@
 ## Installation
 
-### Install Stable Rust and Cargo
+### Install Rust and Cargo
 
-The easiest way to get Cargo is to get the current stable release of [Rust] by
-using the `rustup` script:
+The easiest way to get Cargo is to install the current stable release of [Rust]
+by using `rustup`.
+
+On Linux and macOS systems, this is done as follows:
 
 ```console
 $ curl -sSf https://static.rust-lang.org/rustup.sh | sh
 ```
 
-After this, you can use the `rustup` command to also install `beta` or `nightly`
-channels for Rust and Cargo.
+It will download a script, and start the installation. If everything goes well,
+you’ll see this appear:
+
+```console
+Rust is installed now. Great! 
+```
 
-### Install Nightly Cargo
+On Windows, download and run [rustup-init.exe]. It will start the installation
+in a console and present the above message on success.
 
-To install just Cargo, the current recommended installation method is through
-the official nightly builds. Note that Cargo will also require that [Rust] is
-already installed on the system.
+After this, you can use the `rustup` command to also install `beta` or `nightly`
+channels for Rust and Cargo.
 
-| Platform         | 64-bit            | 32-bit            |
-|------------------|-------------------|-------------------|
-| Linux binaries   | [tar.gz][linux64] | [tar.gz][linux32] |
-| MacOS binaries   | [tar.gz][mac64]   | [tar.gz][mac32]   |
-| Windows binaries | [tar.gz][win64]   | [tar.gz][win32]   |
+For other installation options and information, visit the
+[install][install-rust] page of the Rust website.
 
 ### Build and Install Cargo from Source
 
 Alternatively, you can [build Cargo from source][compiling-from-source].
 
 [rust]: https://www.rust-lang.org/
-[linux64]: https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz
-[linux32]: https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-unknown-linux-gnu.tar.gz
-[mac64]: https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-apple-darwin.tar.gz
-[mac32]: https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-apple-darwin.tar.gz
-[win64]: https://static.rust-lang.org/cargo-dist/cargo-nightly-x86_64-pc-windows-gnu.tar.gz
-[win32]: https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-pc-windows-gnu.tar.gz
+[rustup-init.exe]: https://win.rustup.rs/
+[install-rust]: https://www.rust-lang.org/install.html
 [compiling-from-source]: https://github.com/rust-lang/cargo#compiling-from-source